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

Change-Id: I8f0b18f54219968d9c9286403182cb4f54f8ded0