Merge changes I60d3a05c,Iaa4b496a