stk3x1x 3.5.1.1 from 18.3.1.C.0.2

Change-Id: I80580a6d6ee771338f580609ae85d59c423409b2