Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
am: 4fa8b51c0c  -s ours

Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8