tree d1e9bae474b5b5be26d14e3f1d5e86b358d4b2c8
parent 19045e10b7d7ed42f4b60f00e055ca226bba39ae
parent bac79c18a55a4d23c5741476efd5b3308b683bee
author android-build-team Robot <android-build-team-robot@google.com> 1499813734 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1499813734 +0000

Merge cherrypicks of [2524909, 2524910, 2525349, 2525350] into oc-release

Change-Id: I7d8c9857a6452a163f60a9fff60a2c81f8726678