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

Change-Id: Ic7b6e1092261a0e76fc84b213166729ea3451166