Merge "Misc cleanup for CallNotifier"
Daisuke Miyakawa [Tue, 13 Mar 2012 15:02:25 +0000 (08:02 -0700)]

Trivial merge