Merge "Fix unused variable warning" am: 6f7f629de8
am: 67762b83be

Change-Id: I25c942e67e61d1f9a50cd3849331f7a50f6910bd