some preparation for profileng

Change-Id: I8e2ee521117579d573a60c05737de84691beee08