First check if this is the one we search for, then extract.

Change-Id: Ie98dc14b743983e68f126ed4b7a7f00b637957d3