Merge "Hook up blocked keys" into pi-dev
am: a60ea38f67

Change-Id: I464e3068051471f05512068bc020866f8d8d8f85