Merge ce7202ef7678622499ff05cb4f866e3283e887b4 on remote branch

Change-Id: Ic2a2161b0c928ea15d2b62bbd21b46e80a9d6f38