Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028
am: 72c56fb84a  -s ours

Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3