Bug 1714830 Bug 1696696 Bug 1681952 Bug 1666685 behatnotneeded Change-Id: I4ffbabb28cc00451760134b478758a5c20b86819 (cherry picked from commit 912600e1)