tree 3cf0b5a90a756bb5a72367ac12dace1bb55378d9
parent 2d28c5d8af79198c7812a538b6b16cbdcca4bc9d
parent 58374ed18b175a1f340103c87c27ad65964db66d
author android-build-team Robot <android-build-team-robot@google.com> 1515184353 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1515184353 +0000

Merge cherrypicks of [3422737, 3422885, 3422909, 3422910, 3422878, 3423352] into oc-m2-release

Change-Id: I7f763eb7fbf764fb78fb8e16fa38a0f608e51c36