Merge remote-tracking branch 'origin/t6490_fp5_qssi_CS7_r31.2' into fp5-qssi-0330

Change-Id: I554e0796aa7da347d546743b518498ff44f39ee6