Merge "Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028 am: 72c56fb84a  -s ours am: ea6aaed42d am: cbc1e6afe9" into oc-dr1-dev-plus-aosp