tree bb12ae2b3ee132d28be27f00f17ee99f231e58ee
parent 4d673e8a249c94fda3b175c5dc195a2917b1cca4
parent 25eb924629a5766147f896414794da167d558720
author android-build-team Robot <android-build-team-robot@google.com> 1508186728 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508186728 +0000

Merge cherrypicks of [3074410] into oc-dr1-release

Change-Id: I3a4be4ed2d7644805cfe32374c503bd16887bc97