Merge commit '83eaf6cc' into HEAD

Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e