Merge "AAA-149: migrate ServiceProxy to the correct package name"