Squashed qcom-common updates

Change-Id: I255be335b78c237fd2f5553ad4f08dcb70ff6732