tree 3edfe6af2197e01fdb80506d80e8e9150a743c75
parent cf228f9c23f69d71d7ab40e18026a1fc0186e6c3
parent e755ff3d80b9436d1c10ca1b88ed5a5eb3f9e03f
author android-build-team Robot <android-build-team-robot@google.com> 1498510040 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498510040 +0000

Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280, 2461290, 2461342, 2461291, 2461216, 2461217, 2461304, 2461306, 2461381, 2461307, 2461234, 2461195, 2461308, 2461362, 2461235, 2461218, 2461363, 2461323, 2461382, 2461345] into oc-release

Change-Id: I742af6b7f49c6f1a7111a07c305da76336a21feb