Merge changes I6e49fa9d,Icf9b8fc3