tree 6ad6e9d38779c84f760d3db389e49c3bf4e7f162
parent 806e0278d25a2b25b82b4ed5b38cd9e4cbc5bebe
parent 307451993770c01283dcda6131d53ea06cc23ad3
author android-build-team Robot <android-build-team-robot@google.com> 1512087694 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1512087694 +0000

Merge cherrypicks of [3297237, 3297257, 3297258, 3297277, 3297278, 3297279, 3297280, 3297297, 3297298, 3297299, 3297300, 3297301, 3297302, 3297303, 3297304, 3297305, 3297306, 3297238, 3297281, 3297259, 3297260, 3297261, 3297262, 3297263, 3297264, 3297337, 3297338, 3297339, 3297357, 3297358, 3297359, 3297360, 3297282, 3297265, 3297283, 3297284] into nyc-bugfix-release

Change-Id: Ic3ce547e2742a99f5982f3d9b0c08ce9196d6ba3