tree 2ec6ad0a0a8813ba9e5e12dcdfc65c2cb7cc75a3
parent a71d20ec9f5884983cffb364757d7477447f3548
parent 7dd5d0c9d57e0b6253c5f081a92c1b16efcc109a
author android-build-team Robot <android-build-team-robot@google.com> 1508825543 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508825543 +0000

Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095, 3115988, 3116845, 3116471, 3116500, 3116573, 3115989, 3116501, 3116076, 3116472] into oc-mr1-release

Change-Id: I64d536adbb880017bbc3e53e078e9ec54daa03d5