const improvement

Change-Id: I03815f33117a2927b1882d221f159a5de8d3ba78