tree ce6f8b1ebc560f1b8c9f5bb20c161ccff12e02ea
parent 18d2294a4cd46cc285a95436c503b46184217451
parent 3ad3aecaf66af97c513def4d2d859fbac32bf4ca
author android-build-team Robot <android-build-team-robot@google.com> 1510206272 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1510206272 +0000

Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: I95acbaa82a1bc595d122bab54fb7a4e25e37d4ff