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

Change-Id: I968ed4853ca149e706bd5fdfde8e5431df4bfed7