Merge commit '36dead77bf4785468836fad9934a3f8797fc6af0' into sc-platform-merge
Change-Id: Id7450b8d42cf5261d1dd7f3bda476db96689a02c