Merge changes I4396d3ef,I1f9ce570