tree caf1a56bb9d3188bd082cabf0c4139767cb20c7e
parent 76933feec79d0c245e23de78575ea703e18df2df
parent 2f7d58c828b99c759688a8a19dbed701177e24af
author android-build-team Robot <android-build-team-robot@google.com> 1507925336 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507925336 +0000

Merge cherrypicks of [3063860, 3064438, 3064439, 3063679, 3063680, 3063681, 3064498] into oc-mr1-release

Change-Id: I3e5426d43227e5ad01b8477a848e50cb6c311afd