Merge "Add more log for debugging resource id issue." into sc-dev