tree d69536c095fa4e2a04af788a75d486c3f484afd5
parent 741e826b8842cd018f666c5ebb41160c84a4eeda
parent 661d1c256153e9c4e3efc200ee51d96440cffc2b
author android-build-team Robot <android-build-team-robot@google.com> 1498543251 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498543251 +0000

Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803, 2463746, 2463616, 2463786, 2463747, 2463881, 2463733, 2463804, 2463863, 2463787] into oc-release

Change-Id: I4636c2224c8f0ac18a9ea24104fb142a525aaf72