Implement OriginVn loop prevention

Change-Id: Iab76ad4b07a69f71383db8e72531fb31bade04bd
Implement OriginVn loop prevention

Change-Id: I087b4ff982cb6956dbdcf299bbdc830fcbec2217