Merge "Fix persistent   device search edu" into sc-dev