Merge "Update strings that refer to the OS" into pi-dev