Merge commit '42c46192cae0fd5b85f1ab9ada784b60674fb066' into sc-platform-merge
Change-Id: I22d4c4e24899b1bf3e4e06367ff9bf80128fe9e5