Squash commit sabermod optimization

Change-Id: I3d1440f1091e95c398e8adc05f8e6d292c6f9608