tree 39fb0ba2319e741f7c71f66dbf06fdf0909186c2
parent 8638c76156bc1cfb13c77d3ea10b8996063b74bb
parent 4fb39a3280d15b998713da12255743384984fc01
author android-build-team Robot <android-build-team-robot@google.com> 1508825513 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508825513 +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: Ie28eb9ae8fab72c17f0e55bcd15f6a404ce0ad6a