Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e am: 0ddd7e47 am: 9625d164 am: 996bc6bc -s ours am: 9e39e1e5 Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f