Merge b51d72476068f235d8fa0f1c90ebe40d7a9e7219 on remote branch

Change-Id: Icebe14f63cd15ebaf30cefe8369d213c2b2fa52f