Merge "power_supply: Add local extensions of string property names properly"