CCR Import, made changes per comments in github.

Signed-off-by: Ajil P.M <ajilpm@zhservices.com>