Merge "Remove ro.boot.vr references"