Fix bug 1160550, keystoken typo

Change-Id: Ieb70dc6bf0e30c19c22b92fb59bdebd4bd73e43f
Merge "Fix bug 1160550, keystoken typo"