behatnotneeded Change-Id: I5380cddc0871cb1faa849eed9b4f91b1b646dbde (cherry picked from commit 947f3f89)