behatnotneeded Change-Id: Ie65a2da1c4a6dadb05fb46d00feefb39a09bd754 (cherry picked from commit ad1143dd)