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

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