tree 9b86dc78451a2f172588c4db120afb2c49908d63
parent f855ecf217ef686e2bda6a8208faff4635a26cd5
parent d7aa8adad5e96a0a849678a3edf873244b9db2eb
author android-build-team Robot <android-build-team-robot@google.com> 1500594893 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500594893 +0000

Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-release

Change-Id: Ie7ce56fc2915e78fca4f280f533154e74fc786fd