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

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb