Merge "Don't print error if we can't talk to hwservicemanager." am: 53d36e4476
am: c144b7da38

Change-Id: Ib2b9c2e285bd0dddab59b4ee40599d9fed63fd49