tree df76a373559a07f20b83534e818e8667889c80c0
parent 3820fe85433e465941dfe3794898fbe991686333
parent c8d70ef1334c5deba74cf0e3c91a6f6e375c9b57
author android-build-team Robot <android-build-team-robot@google.com> 1507313186 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507313186 +0000

Merge cherrypicks of [3026515, 3026516, 3026517, 3026518] into oc-r3-release

Change-Id: Ia4fe25e8e0223d11b2f9b8dcb3916c85f6e1e19e