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