tree 3e09c16f6bc9de3c47e583dc1d42b9cf558124d5
parent 42bc16cc7c46155c566936d14c506d974641d289
parent 187fb2a716b4ae0c9faad1c16fdeb08ab1c94cc3
author android-build-team Robot <android-build-team-robot@google.com> 1500594895 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500594895 +0000

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

Change-Id: I33a5aeda1ffc604ecfde2e5cd3b69be81c301433