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

Change-Id: I53ade820c7285638d444c7ca248e416e6e807f92