am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev

* commit '0d84ba3fd82038cb721ffae234a99e6751ed7fbe':
  Fix FLAG_BEACON regression