AOSP_INTL: bring in sync with ATT