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

Change-Id: Iee6560247cc7d3feaf75e2cd196dc5dbd858dc99