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

Change-Id: Ie8b629e97a95f6afd33dc52df71d2508467273e3