tree 4bebe646cc7996fa8aa8151e6476877871a452f6
parent f0fde9cb8c0a29659aa83acc23ca6fbba43a9d31
parent b4312c6bd06bfe2908766efe5ed019920bdda522
author android-build-team Robot <android-build-team-robot@google.com> 1506723612 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506723612 +0000

Merge cherrypicks of [2986362] into oc-release

Change-Id: Ieb07b20c6e8b0558dd7cf0a37aad58c2a19010e7