Squash 5_0_1 and 5_1 migrations

Change-Id: Iad237f87d8fe1f22d613a8989ee931108731be9c
Closes-Bug: #1335088
Merge "Squash 5_0_1 and 5_1 migrations"