tree be4dc7fdac50053705b723fc1d6fe8a62dffbe94
parent 198090d023171c12f0f256d0890aebd4710e6cc6
parent 9ef1d1a8358f5d9cdd0aad210cb4b863e354fa9a
author android-build-team Robot <android-build-team-robot@google.com> 1496254622 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496254622 +0000

Merge cherrypicks of [2337407, 2337461, 2337391, 2337257, 2337318, 2337340, 2337423, 2337481, 2337412, 2337521, 2337413, 2337426, 2337414, 2337415, 2337523, 2337502, 2337503, 2337524, 2337463, 2337483, 2337417, 2337427, 2337561, 2337464, 2337581, 2337484, 2337525, 2337526, 2337527, 2337394, 2337562, 2337528, 2337504, 2337563, 2337565, 2337584, 2337602, 2337530, 2337585, 2337532, 2337487, 2337396, 2337505, 2337432, 2337603, 2337604, 2337534, 2337536, 2337508, 2337606] into nyc-mr1-volantis-release

Change-Id: I7b3418078c92672d361ec160a0a3ac8956929dff