fix primary key handling for android
Merge branch 'develop'