am e5e49cbb: am e2962681: Merge "Overhaul of intellij-gen script."

* commit 'e5e49cbbac0886baef9e880083fe5cd9ce1519c2':