Frameworks av: Small QCOM changes + corrections and cleanup

Change-Id: I513b93a1be0862a1b72e08790e4f87bacb1ef050