tree b22c17141f41c0b74c58402b15a4a5ecbfa8b07f
parent 151aa79c438963b32af05b28a047b320048af1a5
parent 77f36c771eb291a49271899cd4d41252eed37531
author android-build-team Robot <android-build-team-robot@google.com> 1509598285 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509598285 +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: I566bce4d8826a747cf52a8bffb73505899a413bd