Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing"