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

Change-Id: If95f82a5f0dd810c6942b636948066d866dbdc65