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

Change-Id: I8b4967fb9dee355599e6deb611c4b219b669040c