Fixed squisher/opticharger

Change-Id: I6fbb33515fc0bedb91b7d37c2ad86dee6f8a7c1a