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

Change-Id: I73f621eae44bc8cac298d9772b41c5d93eaa185e