Thomas Nolan started work on Sub-task AGDROID-689