Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972)
Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972)