Merge 477b1feda805f990aebbacaa4aaf005614edded8 on remote branch

Change-Id: I65d6fe021105912495d1dc943721ba1114bb637e