behatnotneeded Change-Id: I70e3c27b91bb3b6ec5afd749f3a441e23ce5afc0 (cherry picked from commit 7ba35ae8)