Merge "Remove unused variables/labels to eliminate compile warnings."
am: 0763ee2450

Change-Id: I39bf1bd9e6d8a316b9075e0a18091239b25ce989