tree 9b907a6d9f63e1dd7fccdcbfe361e8d3d3ad05e3
parent 3e0e9138165ee1c2da813cc422dea1085e9d5faa
parent f6a1b2cb8cf2d6df2a127103744c92fc62332d3a
author android-build-team Robot <android-build-team-robot@google.com> 1502217980 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502217980 +0000

Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, 2686143, 2686705, 2686706, 2686707, 2686782, 2686783, 2686784, 2686785, 2686786, 2686787, 2686788, 2686708, 2686144, 2686789, 2686709, 2686710, 2686711, 2686712, 2686713, 2686714, 2686715] into oc-r4-release

Change-Id: Ia7e0e7790b4fe3a3c14f57946310dddbff8f3666