tree 92c747cd4c46608dffce09dbdd08e97a4f2ec464
parent d2eb7d460aca95de2494ec2f69f47e606864a0cf
parent 6c2f7aeb10fb2050c27afa0212a1e167ca2809ec
author android-build-team Robot <android-build-team-robot@google.com> 1498603198 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498603198 +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: Ief1a6241ef1a7899ff0e2f9c421cae24c3b088dd