Merge "Remove ro.boot.vr references" into rvc-dev-plus-aosp