CTS-Coverage-Bug: 179310594
Bug: 160784387
Test: manual
Change-Id: I59b7ff7afec9846a114ee8d20f14d22cf69f0680
Merged-In: I59b7ff7afec9846a114ee8d20f14d22cf69f0680
(cherry picked from commit 726fa0a5f4)
CTS-Coverage-Bug: 179310594
Bug: 160784387
Test: manual
Change-Id: I59b7ff7afec9846a114ee8d20f14d22cf69f0680
Merged-In: I59b7ff7afec9846a114ee8d20f14d22cf69f0680
(cherry picked from commit 726fa0a5f4)