tree df76a373559a07f20b83534e818e8667889c80c0
parent acf19fcb5c4310d8193dda24f7de1a7b6a61e317
parent 40a9be9f5dcecda62fa8bc275e82e852d1f8b906
author android-build-team Robot <android-build-team-robot@google.com> 1507313370 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507313370 +0000

Merge cherrypicks of [3026525, 3026526, 3026527, 3026528] into oc-r5-release

Change-Id: If5482d78e845fd326b171b1b0c4a6515efc55a85