tree 488cfc0d7937acc070fe192cca6b2b0f89d70148
parent c3f69bd768e437afd5d8d87b5fbf8adf49723c82
parent e912d3d00fe440be802e936af3f3a6eb62e898a2
author android-build-team Robot <android-build-team-robot@google.com> 1502214779 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502214779 +0000

Merge cherrypicks of [2686350, 2686440] into oc-r4-release

Change-Id: I2398535d2be0bd039cf9ea5417b15933515f405f