Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev