Revert of DERT61String change from 44021512997b337e6079e46fd4230ce979c20b6f

Bug: 8685209

(cherry picked from commit 9de1ab87afa71c0d39d17fdf260028552202bd3b)

Change-Id: I0f75ffdcf0b82fcf600e85da2850cd66abd97e3b
3 files changed