tree bd6596786d2ce424410d1761222a4d251eafd70e
parent 5c3a63546bbd4d82a126ee15579419e898cbd574
parent 04acb9553a228c3e15638a83c83dc0b883a4efc5
author android-build-team Robot <android-build-team-robot@google.com> 1509074561 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509074561 +0000

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

Change-Id: Iff615e1b8bd2bc3995b017b108d2d0b2c986d320