Merge 4a4771440cc08d1cfe00ec668dd585ac18f67f4a on remote branch

Change-Id: I18f78cfd1c931d3c76df979078979378b32050fb