am: 7d7a2254bc
* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
DO NOT MERGE Sync extras bundle comparison can throw NPE
am: 7d7a2254bc
* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
DO NOT MERGE Sync extras bundle comparison can throw NPE