tree 3582c459fd26f5f994b4b9ba126151750f10460a
parent de66ec27e86f548253f4a6fe2b133dcff98a281a
parent 3f022a07a043d6f91f734205d0f2eb2b657192da
author android-build-team Robot <android-build-team-robot@google.com> 1509744372 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509744372 +0000

Merge cherrypicks of [3167927, 3167338, 3164932, 3167993, 3167994, 3167995, 3167505, 3167506, 3167507, 3167508, 3167509, 3167510, 3167511, 3167512, 3168013, 3168014, 3166332, 3168033, 3168034, 3168035, 3168036, 3168037, 3168038, 3168039, 3168040, 3167977, 3167979, 3167983, 3167717, 3167928, 3168068, 3168069] into nyc-bugfix-release

Change-Id: I115b56e62d6c26f55f5a8e04e69a007092b2a467