tree 26bc5d206c2ab59bd337dd708040d072af2e5983
parent a8ff8beb3daccca104deef2f787807464dadfac7
parent 2997bad1ac48b913db96d9d92b2df59f8e5fa8f6
author android-build-team Robot <android-build-team-robot@google.com> 1493141151 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1493141151 +0000

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

Change-Id: I40db3fb5beaf3634e9682283d7ba07cad2cccaa0