Merge "Back-port fixes for b/62196835" into mnc-dev