Merge commit 'a1f228b92c9ea8a48a374b81b06215cec26b99a0' into sc-platform-merge
Change-Id: I7444df7ac1cafae515ab38e5dafeb6457f7afd2e