Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev
am: 49b684d562

Change-Id: Ie72f27a6a20ec011fd0e8e2ce80c43c4895c9c02