tree 26bc5d206c2ab59bd337dd708040d072af2e5983
parent 249368295b41c3f2bdb39c2f22c11543dd4e1fd7
parent d3f10b9de9995a6d642fddefe02d51afa709f7f4
author android-build-team Robot <android-build-team-robot@google.com> 1492808962 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1492808962 +0000

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

Change-Id: Iee6560247cc7d3feaf75e2cd196dc5dbd858dc99