Merge "Back-port ag/2491664" into nyc-dev
am: 3adf585961  -s ours

Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438