tree 533ab0e8b8a8d77dd085f2ba80a4263456b1f420
parent 02151bca26d22b6e9d1f7f6acba6f05042758da2
parent e05dcb3c0854935a461dbf4389d8a3b6e226f6eb
author android-build-team Robot <android-build-team-robot@google.com> 1509598245 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509598245 +0000

Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release

Change-Id: I107302823b3d3d6a219bdf2caa8909e185ae227a