Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd
am: 80c2eeedbb
Change-Id: I3183c725f1c8246481543832644518d5a2f566c0
This commit is contained in: