Merge 3665ab3c09157a90cb73d6bedecd04a2b29692b7 on remote branch

Change-Id: Ia83e08aa93d335cf1ef406423823cc46111e97dd