Update a bug reference / fix spammy logging
am: 58fa451ab6

Change-Id: I41cf69ddaef3f58bbb0e97102231f65c19e48055