am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev

* commit '22a3163f1da8387e42c68c459f5667ac10744a3c':
  Fix selector bug