Merge "Merge "Add modified API to send more information to VrCore" into oc-dr1-dev am: c48e304b am: 95a35288" into oc-mr1-dev-plus-aosp