Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fb am: 4fa8b51c -s ours am: 2a93c3d3 am: fef2328f am: 713a5420 Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e