Merge d9c9be50479b78c744c98b285edca89ec9ed0670 on remote branch

Change-Id: I85c8b900a49280cd31ecd3074d4fb199464c91c7