Merge "C2 VTS: Fix St12out_of_range" into rvc-dev am: 51fd7f1eba am: acb22186af am: 594dbd52c8 am: 1e7f59cebb am: 956d67471d

Change-Id: I61763e9eb0eebc49312a4dfbc1b87c026d24d364