Merge "Fix Location Check for Barring and RegFail" into rvc-dev