Merge commit '5b6b3acb7162bc21307b94e649962ed59833d121' into sc-platform-merge
Change-Id: I6ff6d8111ef8c9a5142f6bb7da5e6e1efd9b0d88