Merge changes I61fe5ce8,I89758685,I6b215d2a