Calculator: DA translation

Final staging merge

Change-Id: I23c73893b12387fce210814ecdb4e125f1c0540d