Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-dev