Merge "Fix vfc-nslcm customer query bug"