Merge "Update string from "Add device" to "Pair new device" in Setting >...
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: f4dd526f
am: 3f40c152
Change-Id: I169db327d5e07732e45164510244f320787339b0