Merge "Use suffixes instead of stems in the definition of module `app_process`." am: 9c2eef9841
am: 244f224221

Change-Id: I5b6b8b10d671b4cf48fca6f8f33a44b766a3d09d