Merge "Add a fake hwservicemanager for running w/o hwservicemanager"