Merge "dumpstate: Use private interfaces for buffer size properties" am: 430b3667ec
am: 439dbe3bc3

Change-Id: Ia996de428a869552937ec690b4d02af7611c2bc1