Merge "Fixed APN database for GCI"
am: 771d7771ea

Change-Id: If5d27d72f98469dfa6e8c6c06774865732d7cc5a