Reducing dependencies on system services Change-Id: Ida3c5cc034290bdea701d9e6a33706414b667f97
d6288751