Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE