Fix Echo breaking
Bug: 66992
Conflicts: Hooks.php Notifier.php
Change-Id: I7add48c55e04ef4ea5d0f537c6a1a1ba959f628e