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

Change-Id: I29d361184a514cbecc658709e2a8ea08b0e3a20f