Merge "Fix incorrect default wifi power draw values" into mnc-dev