Merge "Tweak the getPartitions API"