tree 21ade39ad4c891a78b3300f9f466eb52b0038234
parent e6170ed029eea24ceb4c35e1cba208c725b18d4d
parent b551854c4370839ad86d33afb7552ee03f03fd26
author android-build-team Robot <android-build-team-robot@google.com> 1509744350 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509744350 +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: Ib6ae2d1924a3bdfb788c02a09bc8c66fa8c0255b