Merge "Read disk ID from intent" into nyc-dev