tree 6cffdfcac0e4089a88ed44bbe56984a877d262d8
parent 748f94c5f3dae3da9e470e37c7d9f2ce9f04e682
parent aefb8dcc2230b260c81cd9bdea2ef433fe0f7420
author android-build-team Robot <android-build-team-robot@google.com> 1497636964 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497636964 +0000

Merge cherrypicks of [2419995, 2419819, 2419918, 2419996, 2419997, 2419975, 2420027] into oc-release

Change-Id: Ia081b12396f4de106ffcce87cc376052b10e1ebe