tree f51367e0b646cbe01444eb49cba83557d14b7093
parent 2506c6f32a5b88199bc6f6509e66ce1cda61cdc9
parent d9d1545f1f07b5bd0cab012979fa937132ba4f09
author android-build-team Robot <android-build-team-robot@google.com> 1497554169 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497554169 +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: I9df9dee70fd39f966ae78be830755e962536a73c