Merge 61638a9606887913e81f30ce1598fc3e2fd44432 on remote branch

Change-Id: I7dec44d1bfdb59a04dc238673f5530796e7e4669