tree 434d09f5d9401963be9f298ae5f2b024481d6f5c
parent 7c95c8c1c8273af0dc0c3f481f263c2a35650abb
parent 4b58c8f3db9fdfd64230afac3e790c2053cb9cf7
author android-build-team Robot <android-build-team-robot@google.com> 1516302520 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1516302520 +0000

Merge cherrypicks of [3478311, 3478390, 3478133, 3478175, 3478391, 3478392, 3478393, 3478134, 3478135, 3478213, 3478214, 3478215, 3478233, 3478234, 3478235, 3478251, 3478252, 3478253, 3478254, 3478394, 3478395, 3478396, 3478397, 3478398, 3478399, 3478400, 3478401, 3478402, 3478403, 3478292, 3478293, 3478312, 3478136, 3477911] into oc-mr1-release

Change-Id: I1dbb4215694209fcf2dee7df2c464468978942fc