tree d43b3a99ec9feff195c9227868c823164eb443a8
parent 6dde8ab6b6357242735b31b5d59c0579ab6e332a
parent 940b4b74336d58d15f272167ff50f4f3ea2e5384
author android-build-team Robot <android-build-team-robot@google.com> 1501111098 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501111098 +0000

Merge cherrypicks of [2604297, 2604299, 2604519, 2606195, 2605695, 2604520, 2606196, 2604521, 2604522, 2606197, 2604523, 2605696, 2605697, 2605698, 2606198, 2604524, 2604525, 2604526, 2604300, 2604527, 2606199, 2604528, 2604529, 2604301, 2606200, 2604302, 2606410, 2606201, 2606411, 2606202, 2606413, 2606203, 2606414, 2604303, 2604304, 2606204, 2604305, 2606206, 2606207, 2604306, 2606415, 2606208, 2606209, 2606416] into nyc-mr1-volantis-release

Change-Id: I6e3b8dc3332e184dd72c3d7d0d7093d6dc6d5fed