Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev