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

Change-Id: I3a8ce7d52c18891c46e0631998c8834d52f31bdf