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

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