Daniel Passos updated Sub-task AGDROID-437