Merge "Include custom partitions in dumpcache tool" am: 3d83a673be
am: b85a2a5a47

Change-Id: I261c4147812ea264a7a19a3f2ce0140835924b74