Merge "Revert^2 "Add GIA (Google Input interface Abstraction laye..."" into main