tree 69b901a3454753d164a804f23540ce1e56fd63f3
parent 0be59f934c089ffd42bc9d54ebaed06e7fbe9dba
parent 035c7451114e54b99d3759af4fbc28e9b6784e87
author android-build-team Robot <android-build-team-robot@google.com> 1519327984 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1519327984 +0000

Merge cherrypicks of [3647392, 3647412, 3647353, 3647354, 3647355, 3647356, 3647413, 3647414, 3647415, 3647416, 3647357, 3647358, 3647432, 3647433] into nyc-bugfix-release

Change-Id: I27c5c425f865bba6ebf1ac9b6ff528c021f54482