Thomas Nolan updated Sub-task AGDROID-689