Merge "Cherrypick unmerged dev admin string edits from Gingerbread."