Merge "Disable READ_PHONE_STATE fix for beta 1" into rvc-dev