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

Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade