Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am: c48e304bbf

Change-Id: I1c93664e2300cb9e234cfbc1c453da30a60e61af