Merge "Update quick scrub tip according to the latest mock." into pi-dev am: d7a053448b
am: 2b1150519d

Change-Id: Ie70de7596b3d894176b35e373bb7a00907f97821