Merge "Merge "Update the ScopedDirectoryAccess sample." into nyc-dev am: e0c04505 am: 5a40d8bc" into nyc-mr1-dev-plus-aosp