behatnotneeded Change-Id: I1e1abea213851f324cd15b0923e5049e2fb5d8d0 (cherry picked from commit baac9f0c)