Merge "Fix LSA hunt for original reference bug."
am: 72627a5f67

Change-Id: I8c20ce515ad50956bee5745167109e55c9f9d66a