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

Change-Id: I537ade417c8b530d9395d9ec928997aa0f51f038