Merge "Add strings needed for additional labels of wifi summary" into pi-dev