am: c455148edc * commit 'c455148edce05b4862df8853a78276fb5f28151a': Sync extras bundle comparison can throw NPE