Merge "Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17 am: 3371693f am: 0fd3dfe0" into sc-dev