Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev am: 9b53851d am: 0814a413 Change-Id: Ie80972ee57290bccb2170e4dd057875e1f2b045d