Merge "Fix OverlayDeviceTests for un-rooted devices"