Merge changes I70b15ea6,I5989410f,I49d96181,Ib3381bca,Ia608df21