Merge "Use device model and name for internal storage." into nyc-dev