(Cherry-pick from cdb78894f0909d58568d0063c48e1a0a1e7f4132) Bug: 203016894 Test: Build pass, verify on device Change-Id: Ib9a3f1d5642ec4c88e752d05529e2e429dbbc95c
Bug: 183183095 Change-Id: Ida78d0352dbd79acb8f2122b51fdb47a2e217bf0
clone from gs101 sha 9d1c97c2 Bug: 183183095 Change-Id: Ie7112bdf0aceb33c9e1956aa52e961b670582733