Merge "Add extra logging for bug 77342775."
am: 3a67727fb4

Change-Id: I36531ad2e1abc7184a61f70ad3fa19bc0eba53a6