This CL must be checked in together with I7e2ba67f31. Change-Id: I51cb982f9cf0ace173d535a60293bb4be83bbb75