Merge "Do not use hidden API DumpUtils"