Add support for rem units (#11279)

Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d