Merge "Wait for current task to complete before revoking challenge" into qt-r1-dev
am: a272625bd3

Change-Id: I6544c8b8ef612ba5f5e1cd11d29c557a9139174a