Merge "Separating the DB upgrade into two paths: > schema update: changes in the table schema > data update: backward compatible changes to the data" into ub-launcher3-dorval
am: d31692c0e7

Change-Id: If9b5e413401ac2b969a591acd81c8e6e1c7c2483