Merge "carrier-wifi: Support RFC4648 encoding method"