am 6b28bed7: Merge "Fix variable reference errors related to check groups." into lmp-mr1-ub-dev

* commit '6b28bed7db5c19985275b33ffeba3f27e9118cc4':
  Fix variable reference errors related to check groups.