Fixing invalid location issue with id extractor

Change-Id: I56df7720eb479d3dfadd9652435353b12fdb03a1
Merge "Fixing invalid location issue with id extractor"