Merge f7ffc81f3761149dadbe31fdc10a4d37157103e4 on remote branch

Change-Id: Ifdfcdc4751e907e0230280c7d9a3c49ef7b7d9a1