behatnotneeded Change-Id: I62bd89b3dd63eac0fd6564cfc7eb2ac9b350286c (cherry picked from commit 2c7e98c2)