am f2c12911: am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

* commit 'f2c12911fb8ef9f40d8e90fe29fef0129edc8553':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.