Merge "Update for increased SW input codes."
am: 028d49fd02

Change-Id: Ic8a98516b8e572318e6c6a5add1751d72da32d6d