Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp
am: 171748e950
* commit '171748e9509aaf30e4fad0afbf8e81086f3c1408':
Change-Id: Ibd71bbc84bc02aa0e6b25956058c8c1079bb0119
This commit is contained in: