Bug 1757, Integration with Sonar.

Change-Id: Iad8097e3b0a420ed49ebcd91b1673d9ab015ad50
Signed-off-by: Alex Fan <railor33@gmail.com>