tree 2609138fac3896ac5efc5011e5d9677082e55a24
parent e4dd2abf7fd6a6b44e75c56941e0e1a9f93f4936
parent fcadd0907120042b50d9b13b5703b9e5ad92ced7
author android-build-team Robot <android-build-team-robot@google.com> 1516302532 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1516302532 +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: Ie5b3183d3c27d25c13024be867ea135e654a3ea1