Use Liquid Optimizations

Change-Id: I53733d30445fb8a669f5b00d290eb4583c46f2a2