tree bb3843032878746daf3ef6f89a06bf2aea05cf6c
parent 5f7c1fedfbebd8c127a2e9f5afce5b97a8ba088d
parent 398bad28aa24e6a639c78854dac8eb5b96354fed
author android-build-team Robot <android-build-team-robot@google.com> 1502231254 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502231254 +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: Ie805d24a40c7295487c71f49966717b4ee9b3dd4