am 35dd7522: Merge "Rewrite raw insert()s and some raw query()s of...
am 35dd7522: Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev
* commit '35dd7522':
Rewrite raw insert()s and some raw query()s of moved-to-global keys