Test: Tested on local device Bug: 178765084 Change-Id: I3b8f36daa31b0a44e788fe4c84f94d48653ee037
cd85c64362
d6d12e558c