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

Change-Id: Ib2f35146eb4aff2b60b2449d76efc6b0aa7a6f76