Merge changes I69557b09,I9bd0b280