Adding Sonar support

Change-Id: I12c5d92b6f50ca20c8426e0e51561d96020a18ce