am: 2f137b7705 * commit '2f137b7705875ee026319abb8e512d918c118222': Sync extras bundle comparison can throw NPE