Merge changes I6265d077,I0be9473e,If481ebdb