Change-Id: I2e047be4ecad4594b9d27bb6d0058fa5971966ce behatnotneeded: Test to come later (cherry picked from commit d77fcb12)