Merge "app_main: silence static analyzer warnings" am: cf188f664a am: 8a4be2a6ae
am: 5987ab35ca

Change-Id: Idc8694cc79e336bb93b38d25fbd7b25ca7a31f0b