Fix unused variable build errors
am: 0a9a1c1ba5

Change-Id: I331cd47269fac66990783cb60571e0b9a0a0ba85