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

Change-Id: Ia6347223262fd8721005763c80d2397a230a14c6