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