behatnotneeded Change-Id: Ia73346aa5a71952ee01d4955b864c7f2573d4a03 (cherry picked from commit 23318637)