am 14f42ca9: am 110ddbfe: Merge "Fix NullPointerException issue when user change"

* commit '14f42ca9f46d2dafaadff2b0ccef645d66679bc7':
  Fix NullPointerException issue when user change