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

Change-Id: I4b71ef850715760d22fd8fde4e491897e1927943