Fixing AGDROID 170
Merge branch 'sqlstore_nested_fix'