code updates

Change-Id: I3ba35006d30519a500d758f5187a190d363be7db