Merge commit 'f9f44b59e5bb4295ebbbcf2cbf4a5048e09d808d' into sc-platform-merge
Change-Id: I3d4b6c1bfe6ff5d66140516ca9741f2b1ef463a7