Merge "Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17c2 am: 3371693fda am: 0fd3dfe01b" into sc-dev