Merge "Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev am: 9b53851d58 am: a3115fb0a5" into oc-mr1-dev-plus-aosp