Create service locator#9

pzanzane merged 2 commits intostarter_codepzanzane/android-testing:starter_codefrom

create_service_locatorpzanzane/android-testing:create_service_locatorCopy head branch name to clipboard