Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am: 004e01d388" into pi-dev-plus-aosp
am: ac4381d357

Change-Id: I613bac5e256a5d0cb7b51dedd2ca528dd3422e2f