Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c
am: 8aadde745f
* commit '8aadde745fdd245a9263d81666fcd3f5f042f0fc':
Change-Id: I09d516df9e22030d82c5e10594274b0ebe1644f2
This commit is contained in: