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

Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819