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

Change-Id: I177be0db1396681b879b1d5c9c8bbad86d59d030