Merge "Add filegroup for telephony file context"