Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours
am: 9e39e1e548

Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f