Merge d3b0ff8362dbe86f6740f83e027e38a040eb5a09 on remote branch

Change-Id: Ifa46b04b3b978f53b34b21edf2fe6b9f6e444ee3