Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev
am: 32b477db15

Change-Id: I615181873ab71e8526556967ae62730633c9f003