tree edcd360b5e89c60aa83fe6949ade6998ca5f95a9
parent cbc5bd80ea3da1684de9f934cfc3983d979125cd
parent 43be3dbf72e2cbbf4969499d22182e5f4a95822c
author android-build-team Robot <android-build-team-robot@google.com> 1498603081 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498603081 +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: Ia9c49bbaab83acc23a4c79e61622cda0398de743