Merge baf4526902762358a41a8db0045ffc9d638ee030 on remote branch

Change-Id: I650c4c6daab1d3e59cf780a5b370198fed984129