Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread