Merge fd0a7dc46364e6dc075ab2483801bbb375948166 on remote branch

Change-Id: I2731ed86fe9d8a0ee1111f5cb86861fa413545b9