Merge proposals dependent on lp://staging/~unity-api-team/telephony-service/file-based-infographics

1. file-based-infographics
2. Dependent merge proposals