Merge 1fde637269516198acc02a297915f9378ab3e0f8 on remote branch

Change-Id: Ic24fc816a4d267d3a5e3bda53d321db0bd32cfed