am 5c2e622c: (-s ours) Merge change 6700 into donut

Merge commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153'

* commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153':
  do not merge - add a big flag to turn off backup