Cherrypick unmerged dev admin string edits from Gingerbread.

Change-Id: Ib20e561ae0e9c2ab164d53afa28591e262afcfc8
1 file changed