tree 0ce2391dcfe389649b298221e58cb8cf15bf7482
parent d95c83403cb2197aeae83ceba5d38ab369549e4f
parent b4d34b0774fb6bd24188797ff4da0811295b4953
author android-build-team Robot <android-build-team-robot@google.com> 1505535815 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505535815 +0000

Merge cherrypicks of [2912773, 2912157, 2912774, 2912159] into oc-dr1-release

Change-Id: Ieca8468448dcd80ebc206d165534fe9c77779b9b