Merge changes Id0369478,I82d8306f