tree 28fe1f14a63d898dbac17b7b1ce7419009c734c8
parent 509678ce9efa2824092d3c2ddca04b8f88f31f61
parent 05807fa1afd29f8c93bf8525280ddf21e58e89d4
author android-build-team Robot <android-build-team-robot@google.com> 1498603192 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498603192 +0000

Merge cherrypicks of [2467803, 2467786, 2467717, 2467598, 2467823, 2467734, 2467671, 2467718, 2467599, 2467753, 2467672, 2467600, 2467735, 2467841, 2467638, 2467824, 2467736, 2467754, 2467737, 2467674] into oc-release

Change-Id: Iaeea349ef72436af0b5da51537514d4fc64cbce0