am 7cd2b19a: am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1

* commit '7cd2b19a926224dee2b2e12f37c1d71ce658bf97':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...