Merge "Don't audit hwservice add -> find." am: b87ab81df3 Change-Id: Ie5173d628a9c53bfc10f104db8b158b98b726665