Merge 7c7ddc7befd5e6801f8d87cffc5fd7f576096820 on remote branch

Change-Id: Iaa9354f6dcdce58ca44b00751b05a8ce7a233619