am: 6d13650c74 * commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db': Sync extras bundle comparison can throw NPE