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

Change-Id: If1facb53f01a7eb33dfdf70681c6de72fa4cef63