More logging in AllApps + a fix
am: 3479cf80e7

Change-Id: Id09516dd2e2aebacf68588c566f713099fc83389