am 5fc7bd13: am 877d5309: am 9a139fe3: am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
* commit '5fc7bd13f87fc22e49e13544ce0c75da0a4cbd34':main
commit
7c246ad9ed
* commit '5fc7bd13f87fc22e49e13544ce0c75da0a4cbd34':main