am 0f6927a6: Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-dev

* commit '0f6927a6946350dcb3031baa9ce1c7575f48307e':
  Additional change to IS_SUPER_PRIMARY