Merge "pm8921: Clean up variable names"