Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am: f4dd526f70

Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd