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

Change-Id: I47d4709cd607cb12057c36f76074474ba0875f45