am: 34b700a7c2 * commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c': Sync extras bundle comparison can throw NPE