Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp * commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63': verify database state before calling sqlite. Bug:2593970