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

Change-Id: I9ca641883aef4472f87c146e15e277471afd771f