Fixes for aniso_pol and water_pol.

Change-Id: Ic86ade1b4eaf84d9351a1eb72f5559e219ee7ce2