Merge "Fix task selection logic" into nyc-dev
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72