Use Liquid Optimizations for all variants

Change-Id: Ibae4a9976e06ed9f584353a402a901512e87b883