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

Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe