Update a bug reference / fix spammy logging am: 58fa451ab6 am: 7cb0d8ca7a am: 4a828763ce
am: 2a719dccf5

Change-Id: I3bba272a17dd48cf7ae2a5d7febcc5a74b531782