Code cleanup - restored play services base (fixing the build)
Code cleanup - restored play services base (fixing the build)

EricssonResearch/monad,rosenjens/monad,rosenjens/monad,rosenjens/monad,EricssonResearch/monad,rosenjens/monad,EricssonResearch/monad,EricssonResearch/monad