Merge "Modification for Neighbhor Cell Test" into lmp-mr1-wfc-dev