Merge commit 'bad5f620df13ae41374e05cad0a391ab084664c4' into kraken * commit 'bad5f620df13ae41374e05cad0a391ab084664c4': verify database state before calling sqlite. Bug:2593970
Merge commit 'bad5f620df13ae41374e05cad0a391ab084664c4' into kraken * commit 'bad5f620df13ae41374e05cad0a391ab084664c4': verify database state before calling sqlite. Bug:2593970