Merge "Fix our interpretation of apn setting's bearer." into jb-dev