Merge "Silence -Wunused-variable compile warning"
am: ff44509b4d

Change-Id: I0fff9320bc6cecf3666def2b00eaffb4ea063365