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

Change-Id: I94e07620edfb512069d86282430a76eeea8dface