tree 19d2082c959f0fffe1039d3876ee79d5c0e2bd15
parent 7d951867416234a6f3228eb9d888009184b1d0b7
parent c6f11815b61152c9365bff924b7b08b42b6700c7
author android-build-team Robot <android-build-team-robot@google.com> 1507764013 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507764013 +0000

Merge cherrypicks of [3052245, 3052625, 3052568] into oc-r4-release

Change-Id: I8209790dae3470dd923d29bee069e1e367679f48