tree b5ab71d930b97ed43ab938ca2b7c56de4025aded
parent 1c4fe5860957ee2885a5a25c1d57914f88000b81
parent f8fb15b87afb627a9d6faf69e750109f2007542d
author android-build-team Robot <android-build-team-robot@google.com> 1495496335 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495496335 +0000

Merge cherrypicks of [2297119, 2297050, 2297018, 2297140] into oc-release

Change-Id: I5c8d8d5ad86d3d7647354fc252c946ef536bedcc