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

* commit '154d251ee61ad9c3d64b5c6db2d74806f4fd5782':
  Fix selector bug