FAIMS-526: updating android queries to use views
merging master