Merge eb8b48944c26a010a8169d4a48749c5ba8438b07 on remote branch

Change-Id: I2913c0e3a633384534450c15501bbc3a6192fd6e