tree 24ee8bd428a0c1b2cfc9b032e26ed48a2ba9f9c0
parent 3bfd446451a9daa82000eb9cc779d9af54ea3472
parent 214063bde9e35737f093773f212bfc97f3ebc3a0
author android-build-team Robot <android-build-team-robot@google.com> 1504804487 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1504804487 +0000

Merge cherrypicks of [2860986, 2860116, 2860927, 2860463, 2861006, 2861007, 2860788, 2860789, 2860790, 2860791, 2860970, 2860792, 2861008, 2860117, 2860971] into oc-r2-release

Change-Id: I389d6327d64a80e88070b9cac4e6d8a04a7c262e