Merge "AF: Fix display of units." into cm-11.0
(cherry picked from commit 0dcd195a8cee403793b369df54651e41309a8b0d)