Merge 810fa6a305fb7aac0a163b426056925fcfc7b4dd on remote branch

Change-Id: I5ae046149c34ade9dbba7309542b6cddfd7122cd