tree 68c45260968995f889d08be7037e56dbed9365fc
parent 76e119cdf803e666ab3cccbce92e5aef344d6caa
parent 4f17d68d8c141b6862e72590113394d48f22162a
author android-build-team Robot <android-build-team-robot@google.com> 1509744364 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509744364 +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: I501a11378f5455432abe40872e3a45a3e0d9b7a6