Change-Id: I4ed0568ced7109cf9c24b832baa261e128905a62 behatnotneeded: Test to come later (cherry picked from commit c6de41d1)