Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev