Merge "Use system property for default for non-2g-only mode." into jb-mr2-dev