behatnotneeded Change-Id: I8e161dc12eac6f19f4c4fa7619beaf1e37d47e81 (cherry picked from commit 92c718de)