Merge "Start hwservicemanager earlier." am: fcd509298d
am: 0a85db775e

Change-Id: I244eae87c9545432d4fc93ccb6dab77b1a564448