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

Change-Id: Ic40d72b1bd7568775f8619123b1fbbb5d285e760