Merge changes I91fe3bfc,I12c20f8d