Merge commit '508be8d3648d996f3e8535595c7fc19cd21d66e5' into sc-platform-merge
Change-Id: Iba170a5aec7d7ff5a1341e36d987f3f4b7f0206c