Merge "Do not read the block device when generating the care map"
am: d9880a0246

Change-Id: I466278a0f2a0158a4a5180be0b99d69e46585be9