tree 2d24c746657f5ee9af2c6883090960c0e8b16ba3
parent b5d1077933fef6cd9f61f770db73a98ed54955ff
parent db344d353df64c2f7ebdb2ec8d8b236e827fc43b
author android-build-team Robot <android-build-team-robot@google.com> 1508825518 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508825518 +0000

Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095, 3115988, 3116845, 3116471, 3116500, 3116573, 3115989, 3116501, 3116076, 3116472] into oc-mr1-release

Change-Id: I97df5de118901872a67558be50a9c40704da2899