Merge commit '06cb46f959557841665ec01762458f60ebaac569' into sc-platform-merge
Change-Id: I5722633e441f31aad69037c7be184241298af096