Merge "C2 VTS: Fix St12out_of_range" into rvc-dev am: 51fd7f1eba am: acb22186af am: 096b368caa am: dfc9f2baf0

Change-Id: I24724839c9479eb284960e618d44f6afc462fa54