Merge "Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501 am: fe99c4282e" into nyc-mr1-dev-plus-aosp
am: 036e33402c
* commit '036e33402cb5eb03f5f15c40b070e17eeebbb0ec':
Change-Id: Icc5796dd3b760a82794815b21db1aeefc42ab948
This commit is contained in: