Merge "Remove checks to support new sim color selection." into lmp-mr1-dev