Merge "Add support for forwarding more special codes" am: 42a0152d72 am: 92ce053f18
am: cb34049ca4

Change-Id: If96b6654c1972be0ca4d60829bfb25d6d2fa51a4