Merge "[am] check if codePath is null before checking incremental" into sc-dev