Merge "RESTRICT AUTOMERGE Moved enteprise resource updatability to Launcher3" into tm-dev