Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1