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

Change-Id: I147bfc451cbe73a02a9e3265e86922520ec43448