qcom/common: Fix merge issue

Change-Id: Ib75d87cbcc521c24b0b8a099e802f7c2407cc232