tree b5daa1354a7cec3427c84b853baa57bd110660a8
parent 87918cbe1b39778b497bed4ffa564ad3e74484c5
parent 278f33f71ab82410beda63ae744ab2b0e643b961
author android-build-team Robot <android-build-team-robot@google.com> 1517346325 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1517346325 +0000

Merge cherrypicks of [3536650, 3536562, 3536563, 3536481, 3535874, 3536495, 3536496, 3536632, 3536633, 3536434, 3535900] into oc-m2-release

Change-Id: I860e68be896364dfd1aaf9be69dac6ad7c540579