tree cc4bf288ba34a3969d8e64c7d0ab7712b0106770
parent 11e9ddc2c14768ab73909231139a77897756d109
parent 4cc1fc9a35827d31ecfd83cb32d304766e7c4f94
author android-build-team Robot <android-build-team-robot@google.com> 1507313713 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507313713 +0000

Merge cherrypicks of [3026769, 3026770, 3026771, 3026772, 3026773, 3026774, 3026789] into oc-dr1-release

Change-Id: I3ce2a98c60f84890840b823a28fea77a98f8935d