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

Change-Id: Ib6813604432530b9e09c1848f89d12dabd348b20