Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501
am: fe99c4282e
* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Change-Id: Ice23b0a3c9fc625f378e9073bdd2c12f2b2e51a3
This commit is contained in: