Fix wrapPassthrough casts to the wrong type. am: 08607dcb21 am: 4b6483a00e
am: 542d9b8a9d

Change-Id: I5213913f63c30eccb5306907afef0a278eb76ce9