tree 3a81683832a2e1d75d06598e3e0b86548747fb0d
parent 89becc539f7e1184bc0260ebe51e880ae807b384
parent 61b9b21916fca68b5e991e1fd43e48b61d4138dc
author android-build-team Robot <android-build-team-robot@google.com> 1502990869 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502990869 +0000

Merge cherrypicks of [2749916] into oc-r4-release

Change-Id: Ice4e4b8556ffddcd902769cf50ea4e39f01f4a75