Fixed extra/missing init files from migrations

Change-Id: Ie264bfe12bc68ddf9c649475e4f8f866019e1af4