Fix "Missing cm/util classes"

Change-Id: Ifd16850372f1b3fcfdb629f36a48063e45c5ee7a