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

* commit '489446d42847dadac708ebaee2be68fe1ad409c6':
  Additional change to IS_SUPER_PRIMARY