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

Change-Id: I4e7551f46599951d08985ae21ea2402148a507a3