tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent f72266813d213f188e7e198937986a56a3c45e2c
parent fafb914fd00db0be03b42ad07280075d43948045
author android-build-team Robot <android-build-team-robot@google.com> 1508536920 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508536920 +0000

Merge cherrypicks of [3105957] into oc-r6-release

Change-Id: I7a0432076893ca05631540b6a842c972f52096f7