Merge changes from topic "lazy-hwservicemanager-detector"
am: 2efc5dd7db

Change-Id: I49936718e6b9770c749f0aa5d1048bf19b8049c4