Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
am: 0ddd7e4714

Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f