Clean up dead code & outdated comment in app image validation
am: ed1cecd996

Change-Id: Ie761feab6fd4e2ddac256815d9f247a9d656e67b