[automerger] Initial changes to support full-width quickscrubbing. am: ededa9cce2

Change-Id: I2bf6dcc1419494d0979239a5cc89057dc784bd58