Merge changes I453a92fd,I68ba6341