Merge tag 'LA.QSSI.12.0.r1-07600-qssi.0' into sc-v2

"LA.QSSI.12.0.r1-07600-qssi.0"

Change-Id: I0a1cd07c153e60127f25f1aecb45e6096a1df444