Merge cherrypicks of [2099168, 2092432, 2035802] into nyc-mr2-pixel-monthly-release

Change-Id: I40db3fb5beaf3634e9682283d7ba07cad2cccaa0