Merge "rpmb_dev: Switch to RPMB provisioning scheme"