tree b9da24c0e732172c0454c8b261855bb8bd9494f8
parent cdbb4c632a64e8ee59d85bb08c950070e9bf36fd
parent ca669299ec03a12b7e9b7935701fe4adcc7f77e9
author android-build-team Robot <android-build-team-robot@google.com> 1493426624 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1493426624 +0000

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

Change-Id: I9b072a8ae407cced868a4aa673538ba4f7c5baf7