Fix --mode app_process am: 7b5603bef0
am: 31a5c8db98

Change-Id: Ia4a99eb4ffa9385c73cd47b7b7ec35e4ffaee536