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

Change-Id: Ic4b90cb53c089ea2b7298fee2d7c23ec133f0bb6