More logging in AllApps + a fix am: 3479cf80e7
am: b4036410f4

Change-Id: I526c4dae91b65231f516a3a959c940bac4540454