[13092329] Fix android issue with picklists/lookups