tree eae45d330f4011ddcad176e0dbb33b816035a326
parent 7d951867416234a6f3228eb9d888009184b1d0b7
parent d88839df25bf663cdc2bc10dcb9037b900be8cc6
author android-build-team Robot <android-build-team-robot@google.com> 1504804478 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1504804478 +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: Ic50e7e567000bdb2d9d1b83df00ab3ba40fa7dc2