More history style updates.

Change-Id: Icc7c2214e6e7f417ba672cfafaa128de61c7c23c