Prepare for off-target core-analysis.

Change-Id: I0a082d578c230a280ec0b6c27212b3ae971e10ad