59affa428e
https://docs.google.com/document/d/1CKK-3vTl-SPGxx3Cwty7r69jk_vaDs9MlanbhpH85cY/edit
Bug: 142753423
Test: Manual
Change-Id: I51e949fa9962bc8e9d0cdb66d07fbe9e344fb35d
(cherry picked from commit 6b13c841c9)