tree 056195f33f9082560b82297c5a3239954c498dbd
parent 3e28dacf957284b31b34c5e6f63bcf64b8318bb2
parent 999ce1d69ef736c7d5c20f0f74be992d855fbcd2
author android-build-team Robot <android-build-team-robot@google.com> 1497554171 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497554171 +0000

Merge cherrypicks of [2413468, 2413357, 2413489, 2413431, 2413506, 2413398, 2413399, 2413319, 2413507, 2413508, 2413371, 2413410, 2413432, 2413358, 2413490, 2413359, 2413360, 2413320, 2413509, 2413491, 2414061, 2413372, 2413492, 2413433, 2413469, 2413411, 2414062, 2413373, 2413374, 2413470, 2413400, 2414063, 2414064, 2413447, 2413434, 2414101, 2413412] into nyc-mr2-release

Change-Id: I4f72d00a640ad8dc9ab6227f72251a4b947d51ef