DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a
am: d7d56a4feb

* commit 'd7d56a4feb5502e17dea4ebb4c9b22347be2b7d3':
  DO NOT MERGE Sync extras bundle comparison can throw NPE