Merge "Fix NPE in SyncManager when updating accounts." into qt-dev am: a5d32d0375
am: 62929d9808

Change-Id: Id2c2644915cf39b2e65662268e43a71949e6d4a7