Merge d06e422e0387b2411973b63524c25a648a1fdce9 on remote branch

Change-Id: Ia79c881b864848f5fedef6e7d19dc675e9af8ace