Updates due to changes to compact_data.

Change-Id: I6fc3de7f4bee3241038bd588f190ea369d044e36