Bug: 147645728 Test: build pass and service running correctly Change-Id: I52b6bcae2c05998e3f22c39998597e2ecef55036