Merge bceaf4d8e743fab2a54671b05ac567f471aebda6 on remote branch

Change-Id: I95784ce37290b03955882fbc6f573f2e2a427fb5