Merge c11eaaec971ed6b0b2abe7a17ddd6dfe9023efa6 on remote branch

Change-Id: I0d7294b11d7861e402f471a73b0aa75619fe8614