Merge "Remove static from the listener."
TreeHugger Robot [Wed, 15 Feb 2017 00:46:58 +0000 (00:46 +0000)]

Trivial merge