Android 5.1.1 release 12
Merge "Google Login- Update the UI for the active user." into idea133