backup/fix_sql-11-52-20

temikus@google.com

581a1267 · Add backwards compatibility · Jun 23, 2018

This is a backup tag before rebasing fix_sql on 90de67b2f02d56feb3fe989674ad74d1c5ee2244