One more place to remap attribute

Change-Id: I14561509cdbf9d3f5d10b66c5b0ed6c4ad5d85f3