Merge "Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable" into cw-f-dev