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

Change-Id: I0a9b460551772f551cc36a37a41f8d6324dc1896