Update a bug reference / fix spammy logging am: 58fa451a am: 7cb0d8ca am: 4a828763 am: 2a719dcc am: 9814e7f9 Change-Id: I75110aa09dae5379f3b144d5640309ab5d673e38