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

Change-Id: I3b2c79f8b967f7db4f565e56cf82313ed892945d