Use this.$$ for $relocatableMarker

Change-Id: I39d4b8bc4f7c88068ad7e290130389f6c532743d
Merge "Use this.$$ for $relocatableMarker"