am 79703fa0: Merge "Cleaning up listeners and AsyncTasks."

# Via Android (Google) Code Review (1) and Winson Chung (1)
* commit '79703fa00cc9820ec004555f843880e3b60e5815':
  Cleaning up listeners and AsyncTasks.