Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev
am: cf665232f3

* commit 'cf665232f332faa4d3c0c6247c6e5685684a1b2a':
  Give the auto-merger somthing to hang on to.

Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65