[CDAP-777] Addressed PR comments