Merge "Update QuickScrub tip according to the latest spec." into pi-dev am: 63b6275a2b
am: 379e333a25

Change-Id: I0db38ffc453c0c1be62c9de8215aa84e7d0a38b5