Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc345 am: a84f7a30 am: 72c56fb8 -s ours am: ea6aaed4 Change-Id: Ifee82294124da12b0114a543dc9ac90f313eaaa2