Merge "[1707-OS] Updated license text according to the"