qseecom: Merge additional changes

Change-Id: I03bb9d5d22593d954467529c3014b1ec5e15ee9d