Merge changes I6ff6c55c,I92b7e285