Use Database::addQuotes instead of hardcoded quotes

Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Merge "Use Database::addQuotes instead of hardcoded quotes"