Sync cm's qcom fm repo

Change-Id: I161677efe0743f0c00e130b8d0726da5dea22796