tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent 48a9b68e039789ce0aa6a748d56c6f822a2b5d28
parent 387b881ff18f5725b0c9c107c27bdc7b76080755
author android-build-team Robot <android-build-team-robot@google.com> 1508180819 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508180819 +0000

Merge cherrypicks of [3072909] into oc-r2-release

Change-Id: Ia5de5212789189548193af6d8e7571e6a9ee62f5