tree b9da24c0e732172c0454c8b261855bb8bd9494f8
parent 398a6a903d95e566b3e6ac2773aeed75d39f2591
parent b762d7810c05d8e3ed2eef0eb67dcf5e5e54bdd7
author android-build-team Robot <android-build-team-robot@google.com> 1493449562 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1493449562 +0000

Merge cherrypicks of [2181832, 2181833, 2152102, 2182287, 2182268, 2182286, 2182190, 2182191] into oc-dr1-release

Change-Id: I153139e241dc721a20780113a357ab6b40b17502