Inherit GSM configuration

Change-Id: Ia796a9d3c41557d0dfa7702e9a1645e777cc8f61
Merge "Inherit GSM configuration" into android-4.4