Wei Li I know this tickets says using the security template. As there is now a demo/example app inside the Android SDK should we aim to include the changes here instead? https://github.com/aerogear/aerogear-android-sdk/tree/master/example