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

Change-Id: If354264cb4f43a2c99a8310f090d95787ee70bda