Merge "Add extra logging for bug 77342775." into pi-dev