Handle database upgrade for MSIM

Change-Id: I7c37252900bf0a61fdd64b301ab5b852711a42e5
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0