Merge commit '8c169fb9fda07f6b552df48fb2d2d243d36ca7e7' into sc-platform-merge
Change-Id: Ic00924d9a3fa50c942b84f355f73e178aa787710