Merge "Update re hwservicemanager debugDump semantics." am: ed2debbb47 am: eec11e4cf5
am: 1cf95ad88a

Change-Id: Ieb69025cf922fbcc4e838c88d8701c8a8a5abfb7