Merge "Add robustness for permissions errors to Surface APIs." into sc-dev