555776fd7f
Also made the unlock conditional.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 63713ca284)