Merge cherrypicks of [2247380, 2246315, 2247358] into nyc-mr2-pixel-monthly-release

Change-Id: I63d2b044988b02601e7050cb3af45e4956338924