Merge "Fixed typo on Storage Access Framework." into nyc-dev