Merge "NPE Fix in SyncStorageEngine" into nyc-dev am: 7503d06e5e
am: 31236ac232

* commit '31236ac2320a47a5fc5ff7914b85a4f15270b161':
  NPE Fix in SyncStorageEngine