am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
automerge: 3f5f13d

* commit '3f5f13d7efb2756d5b9a2cc34c30ac23ced3947f':
  Fix selector bug