tree fdf4acb9512d97a10a6b24228a70af3cdf597496
parent 26828b3c319af3caf16a9ef523c04dd4de0c6832
parent a6d4907712e30bf82f905cdf70d975b5c8e8aaa2
author android-build-team Robot <android-build-team-robot@google.com> 1509074555 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509074555 +0000

Merge cherrypicks of [3131624, 3131640, 3132432, 3132435, 3132438, 3132441, 3132444, 3132447, 3131929, 3131930, 3131931, 3132492, 3132493, 3132033] into oc-dr1-release

Change-Id: Id794b1d2e4a60a197f611b0ab4ee13282b13666b