Merge "Change string from "Add device" to "Pair new device"" into pi-dev
am: 46338558e1

Change-Id: I5fa291ba3677398efcfe0f5b89f10df24463a3fa