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

Change-Id: Ifb83a3c334efe749c79a25f1e8c86a518b93df2c