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

Change-Id: Ied70c772ef25e4933bf3d70724eba3726e5c9b5e