Trying remap binding

Change-Id: I2627332e97f31a9f8e0c1b9ec5b7d42e34b1cd82