Merge commit '23be815516ebb7ba9ad17f7d8829f5224ae733b3' into sc-platform-merge
Change-Id: Iffb8eeca2d5929f4751a9f60977f78ddd90ca4af