Get rid of SingleFileBasedMessageGroup

Change-Id: I101ce5e1a50a316170a2f99784d34ee9291089e9
Merge "Get rid of SingleFileBasedMessageGroup"