Merge changes I4950496e,I849c4bd1