tree 26bc5d206c2ab59bd337dd708040d072af2e5983
parent 1d2adc7f41485bc42e19f395c5d6c7b73d419c70
parent 278ee6b9f51f2d1f1510134b798c9f92db05dc0d
author android-build-team Robot <android-build-team-robot@google.com> 1494530026 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1494530026 +0000

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

Change-Id: I63d2b044988b02601e7050cb3af45e4956338924