Merge changes from topic 'allow-vrcore' into oc-dev am: f2a4bd80c9
am: 15e928b044

Change-Id: Iadd164e096f4a744522ecd6f7926636f50ba1ad9