This contains a critical data corruption fix for people upgrading to train with existing large databases. Change-Id: If894b42d3dbc00a85892e5a7cfb0a656daa31053