Merge changes I95159bcb,Ia74e3097,I661f6439