Fix build error: unused variable 'BoringBits' am: 83cb31377f
am: 28d3c76da6  -s ours

Change-Id: Ie39b2e8ac24aa4eb6a37e3ad571fab9bcc21bfa1