Merge "Update re hwservicemanager debugDump semantics."