Merge "Revert "Add GIA (Google Input interface Abstraction layer) relat..."" into main