tree cc4bf288ba34a3969d8e64c7d0ab7712b0106770
parent 11e9ddc2c14768ab73909231139a77897756d109
parent 7229856bbaa1ac4627f009d66d3d35088525ff4e
author android-build-team Robot <android-build-team-robot@google.com> 1507313895 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507313895 +0000

Merge cherrypicks of [3026753, 3026754, 3026755, 3026756, 3026758, 3026550, 3026551] into oc-dr3-release

Change-Id: Ibacb686732a925b7fd5325f7b2b7bc940a056f7b