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

Change-Id: I7fccb7f1002076d4916ecf63673d97ee9cd8fbaa