Merge "Warn users before they change device name." into pi-dev
am: cd01a3ecd9

Change-Id: I75c974c944dcda55b19dc4566cdb56f9811d2212