Merge changes I14f284cc,I65bfdb56