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

Change-Id: I121b48ca7c657bc524bc9c4bcf250a675f027e3a