1d8a582130
Bug: 145708947
Test: Manual
Change-Id: Ic7da3d36af490ea568481576e26c927020659eda
(cherry picked from commit a8dee18ff1)