Merge "Fix unused variable warning"
am: 6f7f629de8

Change-Id: If0be9ab3ad358db713ee1ccf6d3aba8b0d2cf784