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

Change-Id: I7258810e7e1d4a7ad8dcf60efcf8ea6226137167