am: c0f39c1ece * commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025': Sync extras bundle comparison can throw NPE