[automerger skipped] Merge "Warn users before they change device name." into pi-dev am: cd01a3ecd9
am: f47e1a3930
-s ours
Change-Id: Ibbf6d55d3051f6c45e41ecd74746224c624d8143
This commit is contained in: