Merge "Merge "Follow up to "Add modified API to send more information to...

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

Change-Id: Ibb216507e0cab9a25176c9171205368d4e47fb7c