Improvements to Bot class and GyroModel class.

Change-Id: I050d6bbdb8fa20daf41fb7a7591ebde0e5b6b06f