am 9a139fe3: am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
* commit '9a139fe3ef4b2f84bc8f7f2ede723e9ee4700f96':main
commit
877d530942
* commit '9a139fe3ef4b2f84bc8f7f2ede723e9ee4700f96':main