Merge "Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e am:...

Merge "Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e am: 0ddd7e47 am: 9625d164 am: 996bc6bc  -s ours am: 9e39e1e5 am: afdcad0d am: edbe4bd8 am: 2da30457 am: d761dad2 am: a81076b2" into oc-dr1-dev