tree 9b907a6d9f63e1dd7fccdcbfe361e8d3d3ad05e3
parent 3e0e9138165ee1c2da813cc422dea1085e9d5faa
parent f9e149c452abd34420e22c58231332eff8d840e6
author android-build-team Robot <android-build-team-robot@google.com> 1502231269 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502231269 +0000

Merge cherrypicks of [2688425, 2689040, 2689041, 2689042, 2688662, 2688663, 2688664, 2688426, 2688427, 2688428, 2688665, 2688666, 2688667, 2688668, 2688669, 2688670, 2688671, 2688429, 2688672, 2689043, 2688673, 2688674, 2688675, 2688676, 2688677, 2688678, 2688679, 2688430, 2688431] into oc-release

Change-Id: I97785f112953ab22ffad8ff958ef0f77c13fbb78