Merge "Add unit tests for database migration" am: 1e916de925
am: ff00112b7f

Change-Id: I8de4c2fe97b13fba90e6da2de09b0b39bf371fc9