tree 26b8800dfd9cc1dbf5f356fba0bdaf70819ac449
parent afd351c4447c88c8f859e090c1bea4272e9242a8
parent ce7f91e974eafe6fe14b8acb7a0861221d3c0869
author android-build-team Robot <android-build-team-robot@google.com> 1498603101 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498603101 +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: If445beea9307efe739164791ba361a7fdbabcd64