Merge "Fix logic to preserve preferred APN across build update."