[automerger skipped] Merge "Add extra logging for bug 77342775." into pi-dev am: 709e67c8 -s ours am: e0a3f8fe -s ours Change-Id: I1bdb6d0aa6420ac30e1db11bdd537570986ede1f