Merge "Fix OverlayDeviceTests for un-rooted devices" into sc-dev