Fix unused variable build errors am: 0a9a1c1ba5
am: 7db2d96db9

Change-Id: Id0e0a5b97210ba7cd0439e5ee0dd404758cb60f3