tree 3ef1a4d06a13f6fa6c384ab7fe1ce1777249aab5
parent 1cc2403b87e595402361c264f1affa3231fd1fc1
parent 43c335449287b54e87ee70e931490142beb185d8
author android-build-team Robot <android-build-team-robot@google.com> 1498510035 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498510035 +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: I6c173dc7f7d7076517ca61a86e67b121ec0fb446