Merge ffb19d4c47995d550ceee3d7eac4eb36c50af796 on remote branch

Change-Id: I29f7269dfb66c527ebd77ecd91761febcf9e2ed9