Merge changes Id525d532,I91723b83