Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev am: 573daaaede
am: 0d782836cf

Change-Id: I11a11776bb83cbf7da5647554248347afd2229fb