tree 0d0e8e8baa47ac79dac25b0c8b6a591930333a3f
parent 8fadc9710aa492fb3f3a3573d996142f5cf61571
parent 4c21970277b45b55c6fd28b2eb9de1da836c5626
author android-build-team Robot <android-build-team-robot@google.com> 1505340650 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505340650 +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: I2e4ca2db26fcfb7eef7942258f365765baa71784