Merge 8f85d4a6497ba6da277c890182859e785b4dc8b4 on remote branch

Change-Id: If95447660126c1b79eb55a15b7206cd4fee9caa0