Merge "Do not read the block device when generating the care map" am: d9880a0246 am: 4ef67cee73
am: 49ba2bbe7e

Change-Id: I82416ebcbb08943b686045dca59cd8d4b870800b