tree b491dbb2de5b086275baec175eb516da8e60e93a
parent f2883092632f789a72e79281c9865c1fc276f85e
parent 9f73c363da70754a77b33cd8b575577342ed8c91
author android-build-team Robot <android-build-team-robot@google.com> 1505340634 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505340634 +0000

Merge cherrypicks of [2891344, 2891345, 2891346, 2891347, 2892593, 2892594, 2892595, 2892596, 2891196, 2891255, 2891348, 2892570, 2892598, 2892599, 2892601, 2892602, 2892603, 2892604, 2892605, 2892606, 2892607, 2892608, 2892669, 2892670, 2892671, 2892672, 2892673, 2892479, 2891273, 2891205, 2892674, 2892709, 2892630, 2891206, 2891207, 2891208, 2892729, 2892730, 2892731, 2892732] into nyc-bugfix-release

Change-Id: Ibb6b7c1c5acfd25884890a288cdfcc5cdd886be4