Bug: 147645728 Test: Build pass and service running Change-Id: I5648b569dc470deba14a4fc8a0c841e76a0f1b86