Change from Liquid to CM

Change-Id: I1b470bcde484500def71a3bf36827937c49b77f0