Merge e05b0f1d501954aa19f51533506d3ff3e48a7fc6 on remote branch

Change-Id: Ifaae6a5f5482ae93f11c9ac7298cca16115ffa0c