am 31ae2cc1: Switch BP1->2 upgrade to best effort

* commit '31ae2cc171ed6355d958ea05501ce6e7ef0ad223':
  Switch BP1->2 upgrade to best effort