Bug: 180533061 Test: manual on device Change-Id: Idd700f5c530af67f4936e207e42988267185f256
cd85c64362
d6d12e558c