Merge "Update callers to use buildTemplateMobileWithRatType with metered"