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

Change-Id: Ief54d9216855c32cf61b95a35a4ea1961879b95a