Fixes bug 853455 - Allowed android_model field to be queried as expected.
Merge pull request #1748 from AdrianGaudebert/853455-fix-android-mappings

Fixes bug 853455 - Allowed android_model field to be queried as expected.