David Martin, Wojciech Trocki, Paolo Bueno I really don't know what it's on us, since team-service 1 is doing it => https://github.com/aerogear/aerogear-android-sdk/pull/114