Added back QCOM legacy code which I have accidentally deleted during the merge

Change-Id: Ibd99e0348b2fe29cf5bac253b6e264e7f9feee38